Skip to content

Conversation

jozala
Copy link
Contributor

@jozala jozala commented Sep 1, 2025

With this change it takes into account:

  • that not all versions have previous minor unreleased version (because we are on the oldest active development branch),
  • that current version has minor == 0 (e.g. 9.0) so previous minor have to be calculated differently.

With this change it takes into account that not all versions have
previous minor unreleased version (because we are on the oldest active
development branch), or that current version has minor == 0 (e.g. 9.0)
so previous minor have to be calculated differently.
@jozala jozala requested a review from a team as a code owner September 1, 2025 13:30
@jozala jozala added >non-issue :Delivery/Build Build or test infrastructure auto-backport Automatically create backport pull requests when merged v9.2.0 v9.1.4 v9.0.7 v8.18.7 v8.19.4 labels Sep 1, 2025
@elasticsearchmachine elasticsearchmachine added the Team:Delivery Meta label for Delivery team label Sep 1, 2025
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-delivery (Team:Delivery)

@jozala jozala requested a review from breskeby September 1, 2025 15:11
systemProperty("tests.old_cluster_version", previousMinorSnapshot)
systemProperty("tests.new_cluster_version", fwcVersion)
nonInputProperties.systemProperty 'tests.fwc', 'true'
Version elasticsearchVersion = Version.fromString(versions.get("elasticsearch"))
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replaces the VersionProperties with extension defined by VersionPropertiesPlugin.

@breskeby breskeby requested a review from mark-vieira September 1, 2025 16:30
Copy link
Contributor

@breskeby breskeby left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm from just looking at the code. but do you have an example build that shows the problem or shows the fix?

Ensuring that only relevant branches are considered.
@jozala
Copy link
Contributor Author

jozala commented Sep 2, 2025

lgtm from just looking at the code. but do you have an example build that shows the problem or shows the fix?

The problem is visible if you'll try to re-sync Gradle project in IntelliJ on 9.0 or 8.18 branch. It ends up with:

* What went wrong:
Could not create task ':qa:rolling-upgrade:v9.0.3#fwcTest'.
Expected exactly one argument of type org.elasticsearch.gradle.Version

9.0: https://gradle-enterprise.elastic.co/s/vrn7k6r7kgn46
8.18: https://gradle-enterprise.elastic.co/s/owzgagstljdlq

Comment on lines +16 to +24
shouldRunFwcFor() {
local branch=$1
for fwc_branch in "${FWC_BRANCHES[@]}"; do
if [[ "$fwc_branch" == "$branch" ]]; then
return 0
fi
done
return 1
}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This now also changes on which branches the FwC tests will run.

Utilize Buildkite matrix syntax and escape env in command.
Comment on lines +2 to +3
- label: "{{matrix.FWC_VERSION}}" / fwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v$$FWC_VERSION#fwcTest -Dtests.bwc.snapshot=false
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pipeline definition updated because it wasn't running correctly:
https://buildkite.com/elastic/elasticsearch-periodic-fwc/builds/564

@jozala jozala merged commit 8d193f4 into elastic:main Sep 3, 2025
33 checks passed
jozala added a commit to jozala/elasticsearch that referenced this pull request Sep 3, 2025
With this change it takes into account that not all versions have
previous minor unreleased version (because we are on the oldest active
development branch), or that current version has minor == 0 (e.g. 9.0)
so previous minor have to be calculated differently.

* Add FwC branch configuration and update periodic trigger logic

Ensuring that only relevant branches are considered.

* Correct FWC periodic pipeline variables

Utilize Buildkite matrix syntax and escape env in command.
jozala added a commit to jozala/elasticsearch that referenced this pull request Sep 3, 2025
With this change it takes into account that not all versions have
previous minor unreleased version (because we are on the oldest active
development branch), or that current version has minor == 0 (e.g. 9.0)
so previous minor have to be calculated differently.

* Add FwC branch configuration and update periodic trigger logic

Ensuring that only relevant branches are considered.

* Correct FWC periodic pipeline variables

Utilize Buildkite matrix syntax and escape env in command.
jozala added a commit to jozala/elasticsearch that referenced this pull request Sep 3, 2025
With this change it takes into account that not all versions have
previous minor unreleased version (because we are on the oldest active
development branch), or that current version has minor == 0 (e.g. 9.0)
so previous minor have to be calculated differently.

* Add FwC branch configuration and update periodic trigger logic

Ensuring that only relevant branches are considered.

* Correct FWC periodic pipeline variables

Utilize Buildkite matrix syntax and escape env in command.
@elasticsearchmachine
Copy link
Collaborator

💔 Backport failed

Status Branch Result
9.1
9.0 Commit could not be cherrypicked due to conflicts
8.18
8.19

You can use sqren/backport to manually backport by running backport --upstream elastic/elasticsearch --pr 133937

jozala added a commit to jozala/elasticsearch that referenced this pull request Sep 3, 2025
With this change it takes into account that not all versions have
previous minor unreleased version (because we are on the oldest active
development branch), or that current version has minor == 0 (e.g. 9.0)
so previous minor have to be calculated differently.

* Add FwC branch configuration and update periodic trigger logic

Ensuring that only relevant branches are considered.

* Correct FWC periodic pipeline variables

Utilize Buildkite matrix syntax and escape env in command.

(cherry picked from commit 8d193f4)

# Conflicts:
#	build-tools-internal/src/main/groovy/elasticsearch.fwc-test.gradle
@jozala
Copy link
Contributor Author

jozala commented Sep 3, 2025

💚 All backports created successfully

Status Branch Result
9.0

Questions ?

Please refer to the Backport tool documentation

elasticsearchmachine pushed a commit that referenced this pull request Sep 3, 2025
With this change it takes into account that not all versions have
previous minor unreleased version (because we are on the oldest active
development branch), or that current version has minor == 0 (e.g. 9.0)
so previous minor have to be calculated differently.

* Add FwC branch configuration and update periodic trigger logic

Ensuring that only relevant branches are considered.

* Correct FWC periodic pipeline variables

Utilize Buildkite matrix syntax and escape env in command.
elasticsearchmachine pushed a commit that referenced this pull request Sep 3, 2025
With this change it takes into account that not all versions have
previous minor unreleased version (because we are on the oldest active
development branch), or that current version has minor == 0 (e.g. 9.0)
so previous minor have to be calculated differently.

* Add FwC branch configuration and update periodic trigger logic

Ensuring that only relevant branches are considered.

* Correct FWC periodic pipeline variables

Utilize Buildkite matrix syntax and escape env in command.
jozala added a commit that referenced this pull request Sep 3, 2025
With this change it takes into account that not all versions have
previous minor unreleased version (because we are on the oldest active
development branch), or that current version has minor == 0 (e.g. 9.0)
so previous minor have to be calculated differently.

* Add FwC branch configuration and update periodic trigger logic

Ensuring that only relevant branches are considered.

* Correct FWC periodic pipeline variables

Utilize Buildkite matrix syntax and escape env in command.
elasticsearchmachine pushed a commit that referenced this pull request Sep 3, 2025
With this change it takes into account that not all versions have
previous minor unreleased version (because we are on the oldest active
development branch), or that current version has minor == 0 (e.g. 9.0)
so previous minor have to be calculated differently.

* Add FwC branch configuration and update periodic trigger logic

Ensuring that only relevant branches are considered.

* Correct FWC periodic pipeline variables

Utilize Buildkite matrix syntax and escape env in command.
sarog pushed a commit to portsbuild/elasticsearch that referenced this pull request Sep 11, 2025
With this change it takes into account that not all versions have
previous minor unreleased version (because we are on the oldest active
development branch), or that current version has minor == 0 (e.g. 9.0)
so previous minor have to be calculated differently.

* Add FwC branch configuration and update periodic trigger logic

Ensuring that only relevant branches are considered.

* Correct FWC periodic pipeline variables

Utilize Buildkite matrix syntax and escape env in command.
sarog pushed a commit to portsbuild/elasticsearch that referenced this pull request Sep 19, 2025
With this change it takes into account that not all versions have
previous minor unreleased version (because we are on the oldest active
development branch), or that current version has minor == 0 (e.g. 9.0)
so previous minor have to be calculated differently.

* Add FwC branch configuration and update periodic trigger logic

Ensuring that only relevant branches are considered.

* Correct FWC periodic pipeline variables

Utilize Buildkite matrix syntax and escape env in command.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-backport Automatically create backport pull requests when merged backport pending :Delivery/Build Build or test infrastructure >non-issue Team:Delivery Meta label for Delivery team v8.18.7 v8.19.4 v9.0.7 v9.1.4 v9.2.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants